Autogenerated HTML docs for v2.47.1-397-g23692e
diff --git a/git-diff-tree.html b/git-diff-tree.html index 44b5313..fc0b5d4 100644 --- a/git-diff-tree.html +++ b/git-diff-tree.html
@@ -477,71 +477,71 @@ <div class="sectionbody"> <div class="dlist"> <dl> -<dt class="hdlist1">-p</dt> -<dt class="hdlist1">-u</dt> -<dt class="hdlist1">--patch</dt> +<dt class="hdlist1"><code>-p</code></dt> +<dt class="hdlist1"><code>-u</code></dt> +<dt class="hdlist1"><code>--patch</code></dt> <dd> <p>Generate patch (see <a href="#generate_patch_text_with_p">Generating patch text with -p</a>).</p> </dd> -<dt class="hdlist1">-s</dt> -<dt class="hdlist1">--no-patch</dt> +<dt class="hdlist1"><code>-s</code></dt> +<dt class="hdlist1"><code>--no-patch</code></dt> <dd> <p>Suppress all output from the diff machinery. Useful for commands like <code>git</code> <code>show</code> that show the patch by default to squelch their output, or to cancel the effect of options like <code>--patch</code>, <code>--stat</code> earlier on the command line in an alias.</p> </dd> -<dt class="hdlist1">-U<n></dt> -<dt class="hdlist1">--unified=<n></dt> +<dt class="hdlist1"><code>-U</code><em><n></em></dt> +<dt class="hdlist1"><code>--unified=</code><em><n></em></dt> <dd> -<p>Generate diffs with <n> lines of context instead of +<p>Generate diffs with <em><n></em> lines of context instead of the usual three. Implies <code>--patch</code>.</p> </dd> -<dt class="hdlist1">--output=<file></dt> +<dt class="hdlist1"><code>--output=</code><em><file></em></dt> <dd> <p>Output to a specific file instead of stdout.</p> </dd> -<dt class="hdlist1">--output-indicator-new=<char></dt> -<dt class="hdlist1">--output-indicator-old=<char></dt> -<dt class="hdlist1">--output-indicator-context=<char></dt> +<dt class="hdlist1"><code>--output-indicator-new=</code><em><char></em></dt> +<dt class="hdlist1"><code>--output-indicator-old=</code><em><char></em></dt> +<dt class="hdlist1"><code>--output-indicator-context=</code><em><char></em></dt> <dd> <p>Specify the character used to indicate new, old or context -lines in the generated patch. Normally they are <em>+</em>, <em>-</em> and +lines in the generated patch. Normally they are <code>+</code>, <code>-</code> and ' ' respectively.</p> </dd> -<dt class="hdlist1">--raw</dt> +<dt class="hdlist1"><code>--raw</code></dt> <dd> <p>Generate the diff in raw format. This is the default.</p> </dd> -<dt class="hdlist1">--patch-with-raw</dt> +<dt class="hdlist1"><code>--patch-with-raw</code></dt> <dd> <p>Synonym for <code>-p</code> <code>--raw</code>.</p> </dd> -<dt class="hdlist1">--indent-heuristic</dt> +<dt class="hdlist1"><code>--indent-heuristic</code></dt> <dd> <p>Enable the heuristic that shifts diff hunk boundaries to make patches easier to read. This is the default.</p> </dd> -<dt class="hdlist1">--no-indent-heuristic</dt> +<dt class="hdlist1"><code>--no-indent-heuristic</code></dt> <dd> <p>Disable the indent heuristic.</p> </dd> -<dt class="hdlist1">--minimal</dt> +<dt class="hdlist1"><code>--minimal</code></dt> <dd> <p>Spend extra time to make sure the smallest possible diff is produced.</p> </dd> -<dt class="hdlist1">--patience</dt> +<dt class="hdlist1"><code>--patience</code></dt> <dd> <p>Generate a diff using the "patience diff" algorithm.</p> </dd> -<dt class="hdlist1">--histogram</dt> +<dt class="hdlist1"><code>--histogram</code></dt> <dd> <p>Generate a diff using the "histogram diff" algorithm.</p> </dd> -<dt class="hdlist1">--anchored=<text></dt> +<dt class="hdlist1"><code>--anchored=</code><em><text></em></dt> <dd> <p>Generate a diff using the "anchored diff" algorithm.</p> <div class="paragraph"> @@ -549,19 +549,20 @@ </div> <div class="paragraph"> <p>If a line exists in both the source and destination, exists only once, -and starts with this text, this algorithm attempts to prevent it from +and starts with <em><text></em>, this algorithm attempts to prevent it from appearing as a deletion or addition in the output. It uses the "patience diff" algorithm internally.</p> </div> </dd> -<dt class="hdlist1">--diff-algorithm={patience|minimal|histogram|myers}</dt> +<dt class="hdlist1"><code>--diff-algorithm=</code>(<code>patience</code>|<code>minimal</code>|<code>histogram</code>|<code>myers</code>)</dt> <dd> <p>Choose a diff algorithm. The variants are as follows:</p> <div class="openblock"> <div class="content"> <div class="dlist"> <dl> -<dt class="hdlist1"><code>default</code>, <code>myers</code></dt> +<dt class="hdlist1"><code>default</code></dt> +<dt class="hdlist1"><code>myers</code></dt> <dd> <p>The basic greedy diff algorithm. Currently, this is the default.</p> </dd> @@ -589,7 +590,7 @@ have to use <code>--diff-algorithm=default</code> option.</p> </div> </dd> -<dt class="hdlist1">--stat[=<width>[,<name-width>[,<count>]]]</dt> +<dt class="hdlist1"><code>--stat</code>[<code>=</code><em><width></em>[<code>,</code><em><name-width></em>[<code>,</code><em><count></em>]]]</dt> <dd> <p>Generate a diffstat. By default, as much space as necessary will be used for the filename part, and the rest for the graph @@ -597,9 +598,9 @@ if not connected to a terminal, and can be overridden by <em><width></em>. The width of the filename part can be limited by giving another width <em><name-width></em> after a comma or by setting -<code>diff.statNameWidth=</code><em><width></em>. The width of the graph part can be -limited by using <code>--stat-graph-width=</code><em><width></em> or by setting -<code>diff.statGraphWidth=</code><em><width></em>. Using <code>--stat</code> or +<code>diff.statNameWidth=</code><em><name-width></em>. The width of the graph part can be +limited by using <code>--stat-graph-width=</code><em><graph-width></em> or by setting +<code>diff.statGraphWidth=</code><em><graph-width></em>. Using <code>--stat</code> or <code>--stat-graph-width</code> affects all commands generating a stat graph, while setting <code>diff.statNameWidth</code> or <code>diff.statGraphWidth</code> does not affect <code>git</code> <code>format-patch</code>. @@ -610,16 +611,16 @@ <code>--stat-name-width=</code><em><name-width></em> and <code>--stat-count=</code><em><count></em>.</p> </div> </dd> -<dt class="hdlist1">--compact-summary</dt> +<dt class="hdlist1"><code>--compact-summary</code></dt> <dd> <p>Output a condensed summary of extended header information such -as file creations or deletions ("new" or "gone", optionally "+l" -if it’s a symlink) and mode changes ("+x" or "-x" for adding +as file creations or deletions ("new" or "gone", optionally <code>+l</code> +if it’s a symlink) and mode changes (<code>+x</code> or <code>-x</code> for adding or removing executable bit respectively) in diffstat. The information is put between the filename part and the graph part. Implies <code>--stat</code>.</p> </dd> -<dt class="hdlist1">--numstat</dt> +<dt class="hdlist1"><code>--numstat</code></dt> <dd> <p>Similar to <code>--stat</code>, but shows number of added and deleted lines in decimal notation and pathname without @@ -627,14 +628,14 @@ binary files, outputs two <code>-</code> instead of saying <code>0</code> <code>0</code>.</p> </dd> -<dt class="hdlist1">--shortstat</dt> +<dt class="hdlist1"><code>--shortstat</code></dt> <dd> <p>Output only the last line of the <code>--stat</code> format containing total number of modified files, as well as number of added and deleted lines.</p> </dd> -<dt class="hdlist1">-X[<param1,param2,…​>]</dt> -<dt class="hdlist1">--dirstat[=<param1,param2,…​>]</dt> +<dt class="hdlist1"><code>-X</code> [<em><param></em><code>,..</code>.]</dt> +<dt class="hdlist1"><code>--dirstat</code>[<code>=</code><em><param></em><code>,..</code>.]</dt> <dd> <p>Output the distribution of relative amount of changes for each sub-directory. The behavior of <code>--dirstat</code> can be customized by @@ -678,7 +679,7 @@ reported may exceed 100%. The default (non-cumulative) behavior can be specified with the <code>noncumulative</code> parameter.</p> </dd> -<dt class="hdlist1"><limit></dt> +<dt class="hdlist1"><em><limit></em></dt> <dd> <p>An integer parameter specifies a cut-off percent (3% by default). Directories contributing less than this percentage of the changes @@ -695,24 +696,24 @@ <code>--dirstat=files,10,cumulative</code>.</p> </div> </dd> -<dt class="hdlist1">--cumulative</dt> +<dt class="hdlist1"><code>--cumulative</code></dt> <dd> -<p>Synonym for --dirstat=cumulative</p> +<p>Synonym for <code>--dirstat=cumulative</code>.</p> </dd> -<dt class="hdlist1">--dirstat-by-file[=<param1,param2>…​]</dt> +<dt class="hdlist1"><code>--dirstat-by-file</code>[<code>=</code><em><param></em><code>,..</code>.]</dt> <dd> -<p>Synonym for --dirstat=files,<param1>,<param2>…​</p> +<p>Synonym for <code>--dirstat=files,</code><em><param></em><code>,..</code>..</p> </dd> -<dt class="hdlist1">--summary</dt> +<dt class="hdlist1"><code>--summary</code></dt> <dd> <p>Output a condensed summary of extended header information such as creations, renames and mode changes.</p> </dd> -<dt class="hdlist1">--patch-with-stat</dt> +<dt class="hdlist1"><code>--patch-with-stat</code></dt> <dd> <p>Synonym for <code>-p</code> <code>--stat</code>.</p> </dd> -<dt class="hdlist1">-z</dt> +<dt class="hdlist1"><code>-z</code></dt> <dd> <p>When <code>--raw</code>, <code>--numstat</code>, <code>--name-only</code> or <code>--name-status</code> has been given, do not munge pathnames and use NULs as output field terminators.</p> @@ -722,88 +723,88 @@ <a href="git-config.html">git-config(1)</a>).</p> </div> </dd> -<dt class="hdlist1">--name-only</dt> +<dt class="hdlist1"><code>--name-only</code></dt> <dd> <p>Show only the name of each changed file in the post-image tree. The file names are often encoded in UTF-8. For more information see the discussion about encoding in the <a href="git-log.html">git-log(1)</a> manual page.</p> </dd> -<dt class="hdlist1">--name-status</dt> +<dt class="hdlist1"><code>--name-status</code></dt> <dd> <p>Show only the name(s) and status of each changed file. See the description of the <code>--diff-filter</code> option on what the status letters mean. Just like <code>--name-only</code> the file names are often encoded in UTF-8.</p> </dd> -<dt class="hdlist1">--submodule[=<format>]</dt> +<dt class="hdlist1"><code>--submodule</code>[<code>=</code><em><format></em>]</dt> <dd> <p>Specify how differences in submodules are shown. When specifying -<code>--submodule=short</code> the <em>short</em> format is used. This format just +<code>--submodule=short</code> the <code>short</code> format is used. This format just shows the names of the commits at the beginning and end of the range. -When <code>--submodule</code> or <code>--submodule=log</code> is specified, the <em>log</em> +When <code>--submodule</code> or <code>--submodule=log</code> is specified, the <code>log</code> format is used. This format lists the commits in the range like <a href="git-submodule.html">git-submodule(1)</a> <code>summary</code> does. When <code>--submodule=diff</code> -is specified, the <em>diff</em> format is used. This format shows an +is specified, the <code>diff</code> format is used. This format shows an inline diff of the changes in the submodule contents between the -commit range. Defaults to <code>diff.submodule</code> or the <em>short</em> format +commit range. Defaults to <code>diff.submodule</code> or the <code>short</code> format if the config option is unset.</p> </dd> -<dt class="hdlist1">--color[=<when>]</dt> +<dt class="hdlist1"><code>--color</code>[<code>=</code><em><when></em>]</dt> <dd> <p>Show colored diff. -<code>--color</code> (i.e. without <em>=<when></em>) is the same as <code>--color=always</code>. +<code>--color</code> (i.e. without <code>=</code><em><when></em>) is the same as <code>--color=always</code>. <em><when></em> can be one of <code>always</code>, <code>never</code>, or <code>auto</code>.</p> </dd> -<dt class="hdlist1">--no-color</dt> +<dt class="hdlist1"><code>--no-color</code></dt> <dd> <p>Turn off colored diff. It is the same as <code>--color=never</code>.</p> </dd> -<dt class="hdlist1">--color-moved[=<mode>]</dt> +<dt class="hdlist1"><code>--color-moved</code>[<code>=</code><em><mode></em>]</dt> <dd> <p>Moved lines of code are colored differently. -The <mode> defaults to <em>no</em> if the option is not given -and to <em>zebra</em> if the option with no mode is given. +The <em><mode></em> defaults to <code>no</code> if the option is not given +and to <code>zebra</code> if the option with no mode is given. The mode must be one of:</p> <div class="openblock"> <div class="content"> <div class="dlist"> <dl> -<dt class="hdlist1">no</dt> +<dt class="hdlist1"><code>no</code></dt> <dd> <p>Moved lines are not highlighted.</p> </dd> -<dt class="hdlist1">default</dt> +<dt class="hdlist1"><code>default</code></dt> <dd> <p>Is a synonym for <code>zebra</code>. This may change to a more sensible mode in the future.</p> </dd> -<dt class="hdlist1">plain</dt> +<dt class="hdlist1"><code>plain</code></dt> <dd> <p>Any line that is added in one location and was removed -in another location will be colored with <em>color.diff.newMoved</em>. -Similarly <em>color.diff.oldMoved</em> will be used for removed lines +in another location will be colored with <code>color.diff.newMoved</code>. +Similarly <code>color.diff.oldMoved</code> will be used for removed lines that are added somewhere else in the diff. This mode picks up any moved line, but it is not very useful in a review to determine if a block of code was moved without permutation.</p> </dd> -<dt class="hdlist1">blocks</dt> +<dt class="hdlist1"><code>blocks</code></dt> <dd> <p>Blocks of moved text of at least 20 alphanumeric characters are detected greedily. The detected blocks are -painted using either the <em>color.diff.{old,new}Moved</em> color. +painted using either the <code>color.diff.</code>(<code>old</code>|<code>new</code>)<code>Moved</code> color. Adjacent blocks cannot be told apart.</p> </dd> -<dt class="hdlist1">zebra</dt> +<dt class="hdlist1"><code>zebra</code></dt> <dd> -<p>Blocks of moved text are detected as in <em>blocks</em> mode. The blocks -are painted using either the <em>color.diff.{old,new}Moved</em> color or -<em>color.diff.{old,new}MovedAlternative</em>. The change between +<p>Blocks of moved text are detected as in <code>blocks</code> mode. The blocks +are painted using either the <code>color.diff.</code>(<code>old</code>|<code>new</code>)<code>Moved</code> color or +<code>color.diff.</code>(<code>old</code>|<code>new</code>)<code>MovedAlternative</code>. The change between the two colors indicates that a new block was detected.</p> </dd> -<dt class="hdlist1">dimmed-zebra</dt> +<dt class="hdlist1"><code>dimmed-zebra</code></dt> <dd> -<p>Similar to <em>zebra</em>, but additional dimming of uninteresting parts +<p>Similar to <code>zebra</code>, but additional dimming of uninteresting parts of moved code is performed. The bordering lines of two adjacent blocks are considered interesting, the rest is uninteresting. <code>dimmed_zebra</code> is a deprecated synonym.</p> @@ -813,12 +814,12 @@ </div> </div> </dd> -<dt class="hdlist1">--no-color-moved</dt> +<dt class="hdlist1"><code>--no-color-moved</code></dt> <dd> <p>Turn off move detection. This can be used to override configuration settings. It is the same as <code>--color-moved=no</code>.</p> </dd> -<dt class="hdlist1">--color-moved-ws=<modes></dt> +<dt class="hdlist1"><code>--color-moved-ws=</code><em><mode></em><code>,..</code>.</dt> <dd> <p>This configures how whitespace is ignored when performing the move detection for <code>--color-moved</code>. @@ -827,26 +828,26 @@ <div class="content"> <div class="dlist"> <dl> -<dt class="hdlist1">no</dt> +<dt class="hdlist1"><code>no</code></dt> <dd> <p>Do not ignore whitespace when performing move detection.</p> </dd> -<dt class="hdlist1">ignore-space-at-eol</dt> +<dt class="hdlist1"><code>ignore-space-at-eol</code></dt> <dd> <p>Ignore changes in whitespace at EOL.</p> </dd> -<dt class="hdlist1">ignore-space-change</dt> +<dt class="hdlist1"><code>ignore-space-change</code></dt> <dd> <p>Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent.</p> </dd> -<dt class="hdlist1">ignore-all-space</dt> +<dt class="hdlist1"><code>ignore-all-space</code></dt> <dd> <p>Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none.</p> </dd> -<dt class="hdlist1">allow-indentation-change</dt> +<dt class="hdlist1"><code>allow-indentation-change</code></dt> <dd> <p>Initially ignore any whitespace in the move detection, then group the moved code blocks only into a block if the change in @@ -858,33 +859,32 @@ </div> </div> </dd> -<dt class="hdlist1">--no-color-moved-ws</dt> +<dt class="hdlist1"><code>--no-color-moved-ws</code></dt> <dd> <p>Do not ignore whitespace when performing move detection. This can be used to override configuration settings. It is the same as <code>--color-moved-ws=no</code>.</p> </dd> -<dt class="hdlist1">--word-diff[=<mode>]</dt> +<dt class="hdlist1"><code>--word-diff</code>[<code>=</code><em><mode></em>]</dt> <dd> -<p>Show a word diff, using the <mode> to delimit changed words. -By default, words are delimited by whitespace; see -<code>--word-diff-regex</code> below. The <mode> defaults to <em>plain</em>, and +<p>By default, words are delimited by whitespace; see +<code>--word-diff-regex</code> below. The <em><mode></em> defaults to <code>plain</code>, and must be one of:</p> <div class="openblock"> <div class="content"> <div class="dlist"> <dl> -<dt class="hdlist1">color</dt> +<dt class="hdlist1"><code>color</code></dt> <dd> <p>Highlight changed words using only colors. Implies <code>--color</code>.</p> </dd> -<dt class="hdlist1">plain</dt> +<dt class="hdlist1"><code>plain</code></dt> <dd> -<p>Show words as [<code>-removed-</code>] and {+added+}. Makes no +<p>Show words as [<code>-removed-</code>] and {<code>added</code>}. Makes no attempts to escape the delimiters if they appear in the input, so the output may be ambiguous.</p> </dd> -<dt class="hdlist1">porcelain</dt> +<dt class="hdlist1"><code>porcelain</code></dt> <dd> <p>Use a special line-based format intended for script consumption. Added/removed/unchanged runs are printed in the @@ -893,7 +893,7 @@ end of the line. Newlines in the input are represented by a tilde <code>~</code> on a line of its own.</p> </dd> -<dt class="hdlist1">none</dt> +<dt class="hdlist1"><code>none</code></dt> <dd> <p>Disable word diff again.</p> </dd> @@ -906,14 +906,14 @@ highlight the changed parts in all modes if enabled.</p> </div> </dd> -<dt class="hdlist1">--word-diff-regex=<regex></dt> +<dt class="hdlist1"><code>--word-diff-regex=</code><em><regex></em></dt> <dd> -<p>Use <regex> to decide what a word is, instead of considering +<p>Use <em><regex></em> to decide what a word is, instead of considering runs of non-whitespace to be a word. Also implies <code>--word-diff</code> unless it was already enabled.</p> <div class="paragraph"> <p>Every non-overlapping match of the -<regex> is considered a word. Anything between these matches is +<em><regex></em> is considered a word. Anything between these matches is considered whitespace and ignored(!) for the purposes of finding differences. You may want to append |[<code>^</code>[<code>:space:</code>]] to your regular expression to make sure that it matches all non-whitespace characters. @@ -931,21 +931,21 @@ override configuration settings.</p> </div> </dd> -<dt class="hdlist1">--color-words[=<regex>]</dt> +<dt class="hdlist1"><code>--color-words</code>[<code>=</code><em><regex></em>]</dt> <dd> <p>Equivalent to <code>--word-diff=color</code> plus (if a regex was specified) <code>--word-diff-regex=</code><em><regex></em>.</p> </dd> -<dt class="hdlist1">--no-renames</dt> +<dt class="hdlist1"><code>--no-renames</code></dt> <dd> <p>Turn off rename detection, even when the configuration file gives the default to do so.</p> </dd> -<dt class="hdlist1">--[no-]rename-empty</dt> +<dt class="hdlist1"><code>--</code>[<code>no-</code>]<code>rename-empty</code></dt> <dd> <p>Whether to use empty blobs as rename source.</p> </dd> -<dt class="hdlist1">--check</dt> +<dt class="hdlist1"><code>--check</code></dt> <dd> <p>Warn if changes introduce conflict markers or whitespace errors. What are considered whitespace errors is controlled by <code>core.whitespace</code> @@ -954,9 +954,9 @@ that is immediately followed by a tab character inside the initial indent of the line are considered whitespace errors. Exits with non-zero status if problems are found. Not compatible -with --exit-code.</p> +with <code>--exit-code</code>.</p> </dd> -<dt class="hdlist1">--ws-error-highlight=<kind></dt> +<dt class="hdlist1"><code>--ws-error-highlight=</code><em><kind></em></dt> <dd> <p>Highlight whitespace errors in the <code>context</code>, <code>old</code> or <code>new</code> lines of the diff. Multiple values are separated by comma, @@ -967,19 +967,19 @@ <code>new</code> lines are highlighted. The whitespace errors are colored with <code>color.diff.whitespace</code>.</p> </dd> -<dt class="hdlist1">--full-index</dt> +<dt class="hdlist1"><code>--full-index</code></dt> <dd> <p>Instead of the first handful of characters, show the full pre- and post-image blob object names on the "index" line when generating patch format output.</p> </dd> -<dt class="hdlist1">--binary</dt> +<dt class="hdlist1"><code>--binary</code></dt> <dd> <p>In addition to <code>--full-index</code>, output a binary diff that can be applied with <code>git-apply</code>. Implies <code>--patch</code>.</p> </dd> -<dt class="hdlist1">--abbrev[=<n>]</dt> +<dt class="hdlist1"><code>--abbrev</code>[<code>=</code><em><n></em>]</dt> <dd> <p>Instead of showing the full 40-byte hexadecimal object name in diff-raw format output and diff-tree header @@ -990,8 +990,8 @@ names will be shown regardless of <code>--abbrev</code>. Non default number of digits can be specified with <code>--abbrev=</code><em><n></em>.</p> </dd> -<dt class="hdlist1">-B[<n>][/<m>]</dt> -<dt class="hdlist1">--break-rewrites[=[<n>][/<m>]]</dt> +<dt class="hdlist1"><code>-B</code>[<em><n></em>][<code>/</code><em><m></em>]</dt> +<dt class="hdlist1"><code>--break-rewrites</code>[<code>=</code>[<em><n></em>][<code>/</code><em><m></em>]]</dt> <dd> <p>Break complete rewrite changes into pairs of delete and create. This serves two purposes:</p> @@ -1000,27 +1000,27 @@ not as a series of deletion and insertion mixed together with a very few lines that happen to match textually as the context, but as a single deletion of everything old followed by a single insertion of -everything new, and the number <code>m</code> controls this aspect of the -B +everything new, and the number <em><m></em> controls this aspect of the <code>-B</code> option (defaults to 60%). <code>-B/70</code>% specifies that less than 30% of the original should remain in the result for Git to consider it a total rewrite (i.e. otherwise the resulting patch will be a series of deletion and insertion mixed together with context lines).</p> </div> <div class="paragraph"> -<p>When used with -M, a totally-rewritten file is also considered as the -source of a rename (usually -M only considers a file that disappeared -as the source of a rename), and the number <code>n</code> controls this aspect of -the -B option (defaults to 50%). <code>-B20</code>% specifies that a change with +<p>When used with <code>-M</code>, a totally-rewritten file is also considered as the +source of a rename (usually <code>-M</code> only considers a file that disappeared +as the source of a rename), and the number <em><n></em> controls this aspect of +the <code>-B</code> option (defaults to 50%). <code>-B20</code>% specifies that a change with addition and deletion compared to 20% or more of the file’s size are eligible for being picked up as a possible source of a rename to another file.</p> </div> </dd> -<dt class="hdlist1">-M[<n>]</dt> -<dt class="hdlist1">--find-renames[=<n>]</dt> +<dt class="hdlist1"><code>-M</code>[<em><n></em>]</dt> +<dt class="hdlist1"><code>--find-renames</code>[<code>=</code><em><n></em>]</dt> <dd> <p>Detect renames. -If <code>n</code> is specified, it is a threshold on the similarity +If <em><n></em> is specified, it is a threshold on the similarity index (i.e. amount of addition/deletions compared to the file’s size). For example, <code>-M90</code>% means Git should consider a delete/add pair to be a rename if more than 90% of the file @@ -1030,13 +1030,13 @@ the same as <code>-M5</code>%. To limit detection to exact renames, use <code>-M100</code>%. The default similarity index is 50%.</p> </dd> -<dt class="hdlist1">-C[<n>]</dt> -<dt class="hdlist1">--find-copies[=<n>]</dt> +<dt class="hdlist1"><code>-C</code>[<em><n></em>]</dt> +<dt class="hdlist1"><code>--find-copies</code>[<code>=</code><em><n></em>]</dt> <dd> <p>Detect copies as well as renames. See also <code>--find-copies-harder</code>. -If <code>n</code> is specified, it has the same meaning as for <code>-M</code><em><n></em>.</p> +If <em><n></em> is specified, it has the same meaning as for <code>-M</code><em><n></em>.</p> </dd> -<dt class="hdlist1">--find-copies-harder</dt> +<dt class="hdlist1"><code>--find-copies-harder</code></dt> <dd> <p>For performance reasons, by default, <code>-C</code> option finds copies only if the original file of the copy was modified in the same @@ -1046,8 +1046,8 @@ projects, so use it with caution. Giving more than one <code>-C</code> option has the same effect.</p> </dd> -<dt class="hdlist1">-D</dt> -<dt class="hdlist1">--irreversible-delete</dt> +<dt class="hdlist1"><code>-D</code></dt> +<dt class="hdlist1"><code>--irreversible-delete</code></dt> <dd> <p>Omit the preimage for deletes, i.e. print only the header but not the diff between the preimage and <code>/dev/null</code>. The resulting patch @@ -1061,7 +1061,7 @@ of a delete/create pair.</p> </div> </dd> -<dt class="hdlist1">-l<num></dt> +<dt class="hdlist1"><code>-l</code><em><num></em></dt> <dd> <p>The <code>-M</code> and <code>-C</code> options involve some preliminary steps that can detect subsets of renames/copies cheaply, followed by an @@ -1072,10 +1072,10 @@ destinations, this exhaustive check is O(N^2). This option prevents the exhaustive portion of rename/copy detection from running if the number of source/destination files involved -exceeds the specified number. Defaults to diff.renameLimit. +exceeds the specified number. Defaults to <code>diff.renameLimit</code>. Note that a value of 0 is treated as unlimited.</p> </dd> -<dt class="hdlist1">--diff-filter=[(A|C|D|M|R|T|U|X|B)…​[*]]</dt> +<dt class="hdlist1"><code>--diff-filter=</code>[(<code>A</code>|<code>C</code>|<code>D</code>|<code>M</code>|<code>R</code>|<code>T</code>|<code>U</code>|<code>X</code>|<code>B</code>)<code>...</code>[*]]</dt> <dd> <p>Select only files that are Added (<code>A</code>), Copied (<code>C</code>), Deleted (<code>D</code>), Modified (<code>M</code>), Renamed (<code>R</code>), have their @@ -1096,10 +1096,10 @@ renamed entries cannot appear if detection for those types is disabled.</p> </div> </dd> -<dt class="hdlist1">-S<string></dt> +<dt class="hdlist1"><code>-S</code><em><string></em></dt> <dd> <p>Look for differences that change the number of occurrences of -the specified string (i.e. addition/deletion) in a file. +the specified <em><string></em> (i.e. addition/deletion) in a file. Intended for the scripter’s use.</p> <div class="paragraph"> <p>It is useful when you’re looking for an exact block of code (like a @@ -1112,10 +1112,10 @@ <p>Binary files are searched as well.</p> </div> </dd> -<dt class="hdlist1">-G<regex></dt> +<dt class="hdlist1"><code>-G</code><em><regex></em></dt> <dd> <p>Look for differences whose patch text contains added/removed -lines that match <regex>.</p> +lines that match <em><regex></em>.</p> <div class="paragraph"> <p>To illustrate the difference between <code>-S</code><em><regex></em> <code>--pickaxe-regex</code> and <code>-G</code><em><regex></em>, consider a commit with the following diff in the same @@ -1142,7 +1142,7 @@ information.</p> </div> </dd> -<dt class="hdlist1">--find-object=<object-id></dt> +<dt class="hdlist1"><code>--find-object=</code><em><object-id></em></dt> <dd> <p>Look for differences that change the number of occurrences of the specified object. Similar to <code>-S</code>, just the argument is different @@ -1153,18 +1153,18 @@ <code>git-log</code> to also find trees.</p> </div> </dd> -<dt class="hdlist1">--pickaxe-all</dt> +<dt class="hdlist1"><code>--pickaxe-all</code></dt> <dd> <p>When <code>-S</code> or <code>-G</code> finds a change, show all the changes in that changeset, not just the files that contain the change -in <string>.</p> +in <em><string></em>.</p> </dd> -<dt class="hdlist1">--pickaxe-regex</dt> +<dt class="hdlist1"><code>--pickaxe-regex</code></dt> <dd> -<p>Treat the <string> given to <code>-S</code> as an extended POSIX regular +<p>Treat the <em><string></em> given to <code>-S</code> as an extended POSIX regular expression to match.</p> </dd> -<dt class="hdlist1">-O<orderfile></dt> +<dt class="hdlist1"><code>-O</code><em><orderfile></em></dt> <dd> <p>Control the order in which files appear in the output. This overrides the <code>diff.orderFile</code> configuration variable @@ -1172,7 +1172,7 @@ use <code>-O/dev/null</code>.</p> <div class="paragraph"> <p>The output order is determined by the order of glob patterns in -<orderfile>. +<em><orderfile></em>. All files with pathnames that match the first pattern are output first, all files with pathnames that match the second pattern (but not the first) are output next, and so on. @@ -1184,7 +1184,7 @@ the normal order.</p> </div> <div class="paragraph"> -<p><orderfile> is parsed as follows:</p> +<p><em><orderfile></em> is parsed as follows:</p> </div> <div class="openblock"> <div class="content"> @@ -1208,117 +1208,117 @@ </div> <div class="paragraph"> <p>Patterns have the same syntax and semantics as patterns used for -fnmatch(3) without the FNM_PATHNAME flag, except a pathname also +<code>fnmatch</code>(3) without the <code>FNM_PATHNAME</code> flag, except a pathname also matches a pattern if removing any number of the final pathname components matches the pattern. For example, the pattern "<code>foo</code>*bar" matches "<code>fooasdfbar</code>" and "<code>foo/bar/baz/asdf</code>" but not "<code>foobarx</code>".</p> </div> </dd> -<dt class="hdlist1">--skip-to=<file></dt> -<dt class="hdlist1">--rotate-to=<file></dt> +<dt class="hdlist1"><code>--skip-to=</code><em><file></em></dt> +<dt class="hdlist1"><code>--rotate-to=</code><em><file></em></dt> <dd> -<p>Discard the files before the named <file> from the output +<p>Discard the files before the named <em><file></em> from the output (i.e. <em>skip to</em>), or move them to the end of the output (i.e. <em>rotate to</em>). These options were invented primarily for the use of the <code>git</code> <code>difftool</code> command, and may not be very useful otherwise.</p> </dd> -<dt class="hdlist1">-R</dt> +<dt class="hdlist1"><code>-R</code></dt> <dd> <p>Swap two inputs; that is, show differences from index or on-disk file to tree contents.</p> </dd> -<dt class="hdlist1">--relative[=<path>]</dt> -<dt class="hdlist1">--no-relative</dt> +<dt class="hdlist1"><code>--relative</code>[<code>=</code><em><path></em>]</dt> +<dt class="hdlist1"><code>--no-relative</code></dt> <dd> <p>When run from a subdirectory of the project, it can be told to exclude changes outside the directory and show pathnames relative to it with this option. When you are not in a subdirectory (e.g. in a bare repository), you can name which subdirectory to make the output relative -to by giving a <path> as an argument. +to by giving a <em><path></em> as an argument. <code>--no-relative</code> can be used to countermand both <code>diff.relative</code> config option and previous <code>--relative</code>.</p> </dd> -<dt class="hdlist1">-a</dt> -<dt class="hdlist1">--text</dt> +<dt class="hdlist1"><code>-a</code></dt> +<dt class="hdlist1"><code>--text</code></dt> <dd> <p>Treat all files as text.</p> </dd> -<dt class="hdlist1">--ignore-cr-at-eol</dt> +<dt class="hdlist1"><code>--ignore-cr-at-eol</code></dt> <dd> <p>Ignore carriage-return at the end of line when doing a comparison.</p> </dd> -<dt class="hdlist1">--ignore-space-at-eol</dt> +<dt class="hdlist1"><code>--ignore-space-at-eol</code></dt> <dd> <p>Ignore changes in whitespace at EOL.</p> </dd> -<dt class="hdlist1">-b</dt> -<dt class="hdlist1">--ignore-space-change</dt> +<dt class="hdlist1"><code>-b</code></dt> +<dt class="hdlist1"><code>--ignore-space-change</code></dt> <dd> <p>Ignore changes in amount of whitespace. This ignores whitespace at line end, and considers all other sequences of one or more whitespace characters to be equivalent.</p> </dd> -<dt class="hdlist1">-w</dt> -<dt class="hdlist1">--ignore-all-space</dt> +<dt class="hdlist1"><code>-w</code></dt> +<dt class="hdlist1"><code>--ignore-all-space</code></dt> <dd> <p>Ignore whitespace when comparing lines. This ignores differences even if one line has whitespace where the other line has none.</p> </dd> -<dt class="hdlist1">--ignore-blank-lines</dt> +<dt class="hdlist1"><code>--ignore-blank-lines</code></dt> <dd> <p>Ignore changes whose lines are all blank.</p> </dd> -<dt class="hdlist1">-I<regex></dt> -<dt class="hdlist1">--ignore-matching-lines=<regex></dt> +<dt class="hdlist1"><code>-I</code><em><regex></em></dt> +<dt class="hdlist1"><code>--ignore-matching-lines=</code><em><regex></em></dt> <dd> -<p>Ignore changes whose all lines match <regex>. This option may +<p>Ignore changes whose all lines match <em><regex></em>. This option may be specified more than once.</p> </dd> -<dt class="hdlist1">--inter-hunk-context=<lines></dt> +<dt class="hdlist1"><code>--inter-hunk-context=</code><em><number></em></dt> <dd> -<p>Show the context between diff hunks, up to the specified number +<p>Show the context between diff hunks, up to the specified <em><number></em> of lines, thereby fusing hunks that are close to each other. Defaults to <code>diff.interHunkContext</code> or 0 if the config option is unset.</p> </dd> -<dt class="hdlist1">-W</dt> -<dt class="hdlist1">--function-context</dt> +<dt class="hdlist1"><code>-W</code></dt> +<dt class="hdlist1"><code>--function-context</code></dt> <dd> <p>Show whole function as context lines for each change. The function names are determined in the same way as -<code>git</code> <code>diff</code> works out patch hunk headers (see <em>Defining a -custom hunk-header</em> in <a href="gitattributes.html">gitattributes(5)</a>).</p> +<code>git</code> <code>diff</code> works out patch hunk headers (see "Defining a +custom hunk-header" in <a href="gitattributes.html">gitattributes(5)</a>).</p> </dd> -<dt class="hdlist1">--exit-code</dt> +<dt class="hdlist1"><code>--exit-code</code></dt> <dd> -<p>Make the program exit with codes similar to diff(1). +<p>Make the program exit with codes similar to <code>diff</code>(1). That is, it exits with 1 if there were differences and 0 means no differences.</p> </dd> -<dt class="hdlist1">--quiet</dt> +<dt class="hdlist1"><code>--quiet</code></dt> <dd> <p>Disable all output of the program. Implies <code>--exit-code</code>. Disables execution of external diff helpers whose exit code is not trusted, i.e. their respective configuration option -<code>diff.trustExitCode</code> or <code>diff.</code><em><driver></em><code>.trustExitCode</code> or +<code>diff.trustExitCode</code> or <code>diff.</code><em><driver></em>.<code>trustExitCode</code> or environment variable <code>GIT_EXTERNAL_DIFF_TRUST_EXIT_CODE</code> is false.</p> </dd> -<dt class="hdlist1">--ext-diff</dt> +<dt class="hdlist1"><code>--ext-diff</code></dt> <dd> <p>Allow an external diff helper to be executed. If you set an external diff driver with <a href="gitattributes.html">gitattributes(5)</a>, you need to use this option with <a href="git-log.html">git-log(1)</a> and friends.</p> </dd> -<dt class="hdlist1">--no-ext-diff</dt> +<dt class="hdlist1"><code>--no-ext-diff</code></dt> <dd> <p>Disallow external diff drivers.</p> </dd> -<dt class="hdlist1">--textconv</dt> -<dt class="hdlist1">--no-textconv</dt> +<dt class="hdlist1"><code>--textconv</code></dt> +<dt class="hdlist1"><code>--no-textconv</code></dt> <dd> <p>Allow (or disallow) external text conversion filters to be run when comparing binary files. See <a href="gitattributes.html">gitattributes(5)</a> for @@ -1329,49 +1329,48 @@ <a href="git-log.html">git-log(1)</a>, but not for <a href="git-format-patch.html">git-format-patch(1)</a> or diff plumbing commands.</p> </dd> -<dt class="hdlist1">--ignore-submodules[=<when>]</dt> +<dt class="hdlist1"><code>--ignore-submodules</code>[<code>=</code>(<code>none</code>|<code>untracked</code>|<code>dirty</code>|<code>all</code>)]</dt> <dd> -<p>Ignore changes to submodules in the diff generation. <when> can be -either "none", "untracked", "dirty" or "all", which is the default. -Using "none" will consider the submodule modified when it either contains -untracked or modified files or its HEAD differs from the commit recorded +<p>Ignore changes to submodules in the diff generation. <code>all</code> is the default. +Using <code>none</code> will consider the submodule modified when it either contains +untracked or modified files or its <code>HEAD</code> differs from the commit recorded in the superproject and can be used to override any settings of the -<em>ignore</em> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When -"untracked" is used submodules are not considered dirty when they only +<code>ignore</code> option in <a href="git-config.html">git-config(1)</a> or <a href="gitmodules.html">gitmodules(5)</a>. When +<code>untracked</code> is used submodules are not considered dirty when they only contain untracked content (but they are still scanned for modified -content). Using "dirty" ignores all changes to the work tree of submodules, +content). Using <code>dirty</code> ignores all changes to the work tree of submodules, only changes to the commits stored in the superproject are shown (this was -the behavior until 1.7.0). Using "all" hides all changes to submodules.</p> +the behavior until 1.7.0). Using <code>all</code> hides all changes to submodules.</p> </dd> -<dt class="hdlist1">--src-prefix=<prefix></dt> +<dt class="hdlist1"><code>--src-prefix=</code><em><prefix></em></dt> <dd> -<p>Show the given source prefix instead of "a/".</p> +<p>Show the given source <em><prefix></em> instead of "a/".</p> </dd> -<dt class="hdlist1">--dst-prefix=<prefix></dt> +<dt class="hdlist1"><code>--dst-prefix=</code><em><prefix></em></dt> <dd> -<p>Show the given destination prefix instead of "b/".</p> +<p>Show the given destination <em><prefix></em> instead of "b/".</p> </dd> -<dt class="hdlist1">--no-prefix</dt> +<dt class="hdlist1"><code>--no-prefix</code></dt> <dd> <p>Do not show any source or destination prefix.</p> </dd> -<dt class="hdlist1">--default-prefix</dt> +<dt class="hdlist1"><code>--default-prefix</code></dt> <dd> <p>Use the default source and destination prefixes ("a/" and "b/"). This overrides configuration variables such as <code>diff.noprefix</code>, <code>diff.srcPrefix</code>, <code>diff.dstPrefix</code>, and <code>diff.mnemonicPrefix</code> -(see <code>git-config</code>(1)).</p> +(see <a href="git-config.html">git-config(1)</a>).</p> </dd> -<dt class="hdlist1">--line-prefix=<prefix></dt> +<dt class="hdlist1"><code>--line-prefix=</code><em><prefix></em></dt> <dd> -<p>Prepend an additional prefix to every line of output.</p> +<p>Prepend an additional <em><prefix></em> to every line of output.</p> </dd> -<dt class="hdlist1">--ita-invisible-in-index</dt> +<dt class="hdlist1"><code>--ita-invisible-in-index</code></dt> <dd> -<p>By default entries added by "git add -N" appear as an existing -empty file in "git diff" and a new file in "git diff --cached". -This option makes the entry appear as a new file in "git diff" -and non-existent in "git diff --cached". This option could be +<p>By default entries added by <code>git</code> <code>add</code> <code>-N</code> appear as an existing +empty file in <code>git</code> <code>diff</code> and a new file in <code>git</code> <code>diff</code> <code>--cached</code>. +This option makes the entry appear as a new file in <code>git</code> <code>diff</code> +and non-existent in <code>git</code> <code>diff</code> <code>--cached</code>. This option could be reverted with <code>--ita-visible-in-index</code>. Both options are experimental and could be removed in future.</p> </dd> @@ -2386,8 +2385,8 @@ <h2 id="_raw_output_format">Raw output format</h2> <div class="sectionbody"> <div class="paragraph"> -<p>The raw output format from "git-diff-index", "git-diff-tree", -"git-diff-files" and "git diff --raw" are very similar.</p> +<p>The raw output format from <code>git-diff-index</code>, <code>git-diff-tree</code>, +<code>git-diff-files</code> and <code>git</code> <code>diff</code> <code>--raw</code> are very similar.</p> </div> <div class="paragraph"> <p>These commands all compare two sets of things; what is @@ -2395,26 +2394,26 @@ </div> <div class="dlist"> <dl> -<dt class="hdlist1">git-diff-index <tree-ish></dt> +<dt class="hdlist1"><code>git-diff-index</code> <em><tree-ish></em></dt> <dd> -<p>compares the <tree-ish> and the files on the filesystem.</p> +<p>compares the <em><tree-ish></em> and the files on the filesystem.</p> </dd> -<dt class="hdlist1">git-diff-index --cached <tree-ish></dt> +<dt class="hdlist1"><code>git-diff-index</code> <code>--cached</code> <em><tree-ish></em></dt> <dd> -<p>compares the <tree-ish> and the index.</p> +<p>compares the <em><tree-ish></em> and the index.</p> </dd> -<dt class="hdlist1">git-diff-tree [-r] <tree-ish-1> <tree-ish-2> [<pattern>…​]</dt> +<dt class="hdlist1"><code>git-diff-tree</code> [<code>-r</code>] <em><tree-ish-1></em> <em><tree-ish-2></em> [<em><pattern></em>...]</dt> <dd> <p>compares the trees named by the two arguments.</p> </dd> -<dt class="hdlist1">git-diff-files [<pattern>…​]</dt> +<dt class="hdlist1"><code>git-diff-files</code> [<em><pattern></em>...]</dt> <dd> <p>compares the index and the files on the filesystem.</p> </dd> </dl> </div> <div class="paragraph"> -<p>The "git-diff-tree" command begins its output by printing the hash of +<p>The <code>git-diff-tree</code> command begins its output by printing the hash of what is being compared. After that, all the commands print one output line per changed file.</p> </div> @@ -2489,36 +2488,36 @@ <div class="ulist"> <ul> <li> -<p>A: addition of a file</p> +<p><code>A</code>: addition of a file</p> </li> <li> -<p>C: copy of a file into a new one</p> +<p><code>C</code>: copy of a file into a new one</p> </li> <li> -<p>D: deletion of a file</p> +<p><code>D</code>: deletion of a file</p> </li> <li> -<p>M: modification of the contents or mode of a file</p> +<p><code>M</code>: modification of the contents or mode of a file</p> </li> <li> -<p>R: renaming of a file</p> +<p><code>R</code>: renaming of a file</p> </li> <li> -<p>T: change in the type of the file (regular file, symbolic link or submodule)</p> +<p><code>T</code>: change in the type of the file (regular file, symbolic link or submodule)</p> </li> <li> -<p>U: file is unmerged (you must complete the merge before it can +<p><code>U</code>: file is unmerged (you must complete the merge before it can be committed)</p> </li> <li> -<p>X: "unknown" change type (most probably a bug, please report it)</p> +<p><code>X</code>: "unknown" change type (most probably a bug, please report it)</p> </li> </ul> </div> <div class="paragraph"> -<p>Status letters C and R are always followed by a score (denoting the +<p>Status letters <code>C</code> and <code>R</code> are always followed by a score (denoting the percentage of similarity between the source and target of the move or -copy). Status letter M may be followed by a score (denoting the +copy). Status letter <code>M</code> may be followed by a score (denoting the percentage of dissimilarity) for file rewrites.</p> </div> <div class="paragraph"> @@ -2545,7 +2544,7 @@ <h2 id="_diff_format_for_merges">diff format for merges</h2> <div class="sectionbody"> <div class="paragraph"> -<p>"git-diff-tree", "git-diff-files" and "git-diff --raw" +<p><code>git-diff-tree</code>, <code>git-diff-files</code> and <code>git-diff</code> <code>--raw</code> can take <code>-c</code> or <code>--cc</code> option to generate diff output also for merge commits. The output differs from the format described above in the following way:</p> @@ -2618,7 +2617,7 @@ (see <a href="git.html">git(1)</a>), and the <code>diff</code> attribute (see <a href="gitattributes.html">gitattributes(5)</a>).</p> </div> <div class="paragraph"> -<p>What the -p option produces is slightly different from the traditional +<p>What the <code>-p</code> option produces is slightly different from the traditional diff format:</p> </div> <div class="olist arabic"> @@ -2643,23 +2642,21 @@ </li> <li> <p>It is followed by one or more extended header lines:</p> -<div class="literalblock"> -<div class="content"> -<pre>old mode <mode> -new mode <mode> -deleted file mode <mode> -new file mode <mode> -copy from <path> -copy to <path> -rename from <path> -rename to <path> -similarity index <number> -dissimilarity index <number> -index <hash>..<hash> <mode></pre> -</div> +<div class="verseblock"> +<pre class="content"><code>old</code> <code>mode</code> <em><mode></em> +<code>new</code> <code>mode</code> <em><mode></em> +<code>deleted</code> <code>file</code> <code>mode</code> <em><mode></em> +<code>new</code> <code>file</code> <code>mode</code> <em><mode></em> +<code>copy</code> <code>from</code> <em><path></em> +<code>copy</code> <code>to</code> <em><path></em> +<code>rename</code> <code>from</code> <em><path></em> +<code>rename</code> <code>to</code> <em><path></em> +<code>similarity</code> <code>index</code> <em><number></em> +<code>dissimilarity</code> <code>index</code> <em><number></em> +<code>index</code> <em><hash></em>`..`<em><hash></em> <em><mode></em></pre> </div> <div class="paragraph"> -<p>File modes are printed as 6-digit octal numbers including the file type +<p>File modes <em><mode></em> are printed as 6-digit octal numbers including the file type and file permission bits.</p> </div> <div class="paragraph"> @@ -2675,7 +2672,7 @@ </div> <div class="paragraph"> <p>The index line includes the blob object names before and after the change. -The <mode> is included if the file mode does not change; otherwise, +The <em><mode></em> is included if the file mode does not change; otherwise, separate lines indicate the old and the new mode.</p> </div> </li> @@ -2777,20 +2774,18 @@ <li> <p>It is followed by one or more extended header lines (this example shows a merge with two parents):</p> -<div class="literalblock"> -<div class="content"> -<pre>index <hash>,<hash>..<hash> -mode <mode>,<mode>..<mode> -new file mode <mode> -deleted file mode <mode>,<mode></pre> -</div> +<div class="verseblock"> +<pre class="content"><code>index</code> <em><hash></em><code>,</code><em><hash></em>`..<code>__</code><em><hash></em><code>__</code> +{empty}`mode <em><mode></em><code>,</code><em><mode></em>``..``<em><mode></em> +<code>new</code> <code>file</code> <code>mode</code> <em><mode></em> +<code>deleted</code> <code>file</code> <code>mode</code> <em><mode></em><code>,</code><em><mode></em></pre> </div> <div class="paragraph"> <p>The <code>mode</code> <em><mode></em><code>,</code><em><mode></em><code>..</code><em><mode></em> line appears only if at least one of the <mode> is different from the rest. Extended headers with information about detected content movement (renames and copying detection) are designed to work with the diff of two -<tree-ish> and are not used by combined diff format.</p> +<em><tree-ish></em> and are not used by combined diff format.</p> </div> </li> <li> @@ -2881,7 +2876,7 @@ <div class="sectionbody"> <div class="paragraph"> <p>The <code>--summary</code> option describes newly added, deleted, renamed and -copied files. The <code>--stat</code> option adds diffstat(1) graph to the +copied files. The <code>--stat</code> option adds <code>diffstat</code>(1) graph to the output. These options can be combined with other options, such as <code>-p</code>, and are meant for human consumption.</p> </div> @@ -2995,7 +2990,7 @@ </div> <div id="footer"> <div id="footer-text"> -Last updated 2024-08-21 14:01:26 -0700 +Last updated 2024-08-22 06:01:26 +0900 </div> </div> </body> 